Use the returnto parameter on successfull login

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c0cd88d..6497f62 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -137,6 +137,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5751) Updates to Portuguese localisation files
 * (bug 5741) Introduce {{NUMBEROFUSERS}} magic word
 * (bug 93) <nowiki> tags and tildes in templates
+* The returnto parameter is now actually used by SpecialUserlogin.php
 
 == Compatibility ==
 

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 3c98c7a..d6112c8 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -421,7 +421,11 @@ class LoginForm {
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
                $wgOut->addWikiText( $msg );
-               $wgOut->returnToMain( $auto );
+               if ( !empty( $this->mReturnto ) ) {
+                       $wgOut->returnToMain( $auto, $this->mReturnTo );
+               } else {
+                       $wgOut->returnToMain( $auto );
+               }
        }
 
        /** */